Autogenerated HTML docs for v2.4.0-53-g8440f
diff --git a/RelNotes/2.5.0.txt b/RelNotes/2.5.0.txt new file mode 100644 index 0000000..24992b2 --- /dev/null +++ b/RelNotes/2.5.0.txt
@@ -0,0 +1,86 @@ +Git 2.5 Release Notes +===================== + +Updates since v2.4 +------------------ + +Ports + + +UI, Workflows & Features + + * "git p4" now detects the filetype (e.g. binary) correctly even when + the files are opened exclusively. + + * "git show-branch --topics HEAD" (with no other arguments) did not + do anything interesting. Instead, contrast the given revision + against all the local branches by default. + + +Performance, Internal Implementation, Development Support etc. + + * "unsigned char [20]" used thoughout the code to represent object + names are being converted into a semi-opaque "struct object_id". + This effort is expected to interfere with other topics in flight, + but hopefully will give us one extra level of abstraction in the + end, when completed. + + +Also contains various documentation updates and code clean-ups. + + +Fixes since v2.4 +---------------- + +Unless otherwise noted, all the fixes since v2.4 in the maintenance +track are contained in this release (see the maintenance releases' +notes for details). + + * We avoid setting core.worktree when the repository location is the + ".git" directory directly at the top level of the working tree, but + the code misdetected the case in which the working tree is at the + root level of the filesystem (which arguably is a silly thing to + do, but still valid). + (merge 84ccad8 jk/init-core-worktree-at-root later to maint). + + * "git commit --date=now" or anything that relies on approxidate lost + the daylight-saving-time offset. + (merge f6e6362 jc/epochtime-wo-tz later to maint). + + * Access to objects in repositories that borrow from another one on a + slow NFS server unnecessarily got more expensive due to recent code + becoming more cautious in a naive way not to lose objects to pruning. + (merge ee1c6c3 jk/prune-mtime later to maint). + + * The codepaths that read .gitignore and .gitattributes files have been + taught that these files encoded in UTF-8 may have UTF-8 BOM marker at + the beginning; this makes it in line with what we do for configuration + files already. + (merge 27547e5 cn/bom-in-gitignore later to maint). + + * a few helper scripts in the test suite did not report errors + correcty. + (merge de248e9 ep/fix-test-lib-functions-report later to maint). + + * The default $HOME/.gitconfig file created upon "git config --global" + that edits it had incorrectly spelled user.name and user.email + entries in it. + (merge 7e11052 oh/fix-config-default-user-name-section later to maint). + + * "git cat-file bl $blob" failed to barf even though there is no + object type that is "bl". + (merge b7994af jk/type-from-string-gently later to maint). + + * The usual "git diff" when seeing a file turning into a directory + showed a patchset to remove the file and create all files in the + directory, but "git diff --no-index" simply refused to work. Also, + when asked to compare a file and a directory, imitate POSIX "diff" + and compare the file with the file with the same name in the + directory, instead of refusing to run. + (merge 0615173 jc/diff-no-index-d-f later to maint). + + * Code cleanups and documentation updates. + (merge 0269f96 mm/usage-log-l-can-take-regex later to maint). + (merge 64f2589 nd/t1509-chroot-test later to maint). + (merge f86a374 sb/test-bitmap-free-at-end later to maint). + (merge 05bfc7d sb/line-log-plug-pairdiff-leak later to maint).
diff --git a/blame-options.txt b/blame-options.txt index b299b59..a09969b 100644 --- a/blame-options.txt +++ b/blame-options.txt
@@ -10,7 +10,7 @@ Include additional statistics at the end of blame output. -L <start>,<end>:: --L :<regex>:: +-L :<funcname>:: Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed. +
diff --git a/git-annotate.html b/git-annotate.html index 86fcba1..efdf991 100644 --- a/git-annotate.html +++ b/git-annotate.html
@@ -798,7 +798,7 @@ -L <start>,<end> </dt> <dt class="hdlist1"> --L :<regex> +-L :<funcname> </dt> <dd> <p> @@ -835,11 +835,12 @@ of lines before or after the line given by <start>.</p></div> </li> </ul></div> -<div class="paragraph"><p>If “:<regex>” is given in place of <start> and <end>, it denotes the range -from the first funcname line that matches <regex>, up to the next -funcname line. “:<regex>” searches from the end of the previous <code>-L</code> range, -if any, otherwise from the start of file. -“^:<regex>” searches from the start of file.</p></div> +<div class="paragraph"><p>If “:<funcname>” is given in place of <start> and <end>, it is a +regular expression that denotes the range from the first funcname line +that matches <funcname>, up to the next funcname line. “:<funcname>” +searches from the end of the previous <code>-L</code> range, if any, otherwise +from the start of file. “^:<funcname>” searches from the start of +file.</p></div> </dd> <dt class="hdlist1"> -l
diff --git a/git-blame.html b/git-blame.html index b024a91..fb87720 100644 --- a/git-blame.html +++ b/git-blame.html
@@ -818,7 +818,7 @@ -L <start>,<end> </dt> <dt class="hdlist1"> --L :<regex> +-L :<funcname> </dt> <dd> <p> @@ -855,11 +855,12 @@ of lines before or after the line given by <start>.</p></div> </li> </ul></div> -<div class="paragraph"><p>If “:<regex>” is given in place of <start> and <end>, it denotes the range -from the first funcname line that matches <regex>, up to the next -funcname line. “:<regex>” searches from the end of the previous <code>-L</code> range, -if any, otherwise from the start of file. -“^:<regex>” searches from the start of file.</p></div> +<div class="paragraph"><p>If “:<funcname>” is given in place of <start> and <end>, it is a +regular expression that denotes the range from the first funcname line +that matches <funcname>, up to the next funcname line. “:<funcname>” +searches from the end of the previous <code>-L</code> range, if any, otherwise +from the start of file. “^:<funcname>” searches from the start of +file.</p></div> </dd> <dt class="hdlist1"> -l
diff --git a/git-log.html b/git-log.html index 7f1daab..8788feb 100644 --- a/git-log.html +++ b/git-log.html
@@ -839,12 +839,12 @@ -L <start>,<end>:<file> </dt> <dt class="hdlist1"> --L :<regex>:<file> +-L :<funcname>:<file> </dt> <dd> <p> Trace the evolution of the line range given by "<start>,<end>" - (or the funcname regex <regex>) within the <file>. You may + (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. @@ -878,11 +878,12 @@ of lines before or after the line given by <start>.</p></div> </li> </ul></div> -<div class="paragraph"><p>If “:<regex>” is given in place of <start> and <end>, it denotes the range -from the first funcname line that matches <regex>, up to the next -funcname line. “:<regex>” searches from the end of the previous <code>-L</code> range, -if any, otherwise from the start of file. -“^:<regex>” searches from the start of file.</p></div> +<div class="paragraph"><p>If “:<funcname>” is given in place of <start> and <end>, it is a +regular expression that denotes the range from the first funcname line +that matches <funcname>, up to the next funcname line. “:<funcname>” +searches from the end of the previous <code>-L</code> range, if any, otherwise +from the start of file. “^:<funcname>” searches from the start of +file.</p></div> </dd> <dt class="hdlist1"> <revision range> @@ -3997,7 +3998,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-03-23 14:31:16 PDT +Last updated 2015-05-06 12:32:59 PDT </div> </div> </body>
diff --git a/git-log.txt b/git-log.txt index 18bc716..5692945 100644 --- a/git-log.txt +++ b/git-log.txt
@@ -62,9 +62,9 @@ output by allowing them to allocate space in advance. -L <start>,<end>:<file>:: --L :<regex>:<file>:: +-L :<funcname>:<file>:: Trace the evolution of the line range given by "<start>,<end>" - (or the funcname regex <regex>) within the <file>. You may + (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments.
diff --git a/gitk.html b/gitk.html index 0fbedb4..6a66961 100644 --- a/gitk.html +++ b/gitk.html
@@ -888,12 +888,12 @@ -L<start>,<end>:<file> </dt> <dt class="hdlist1"> --L:<regex>:<file> +-L:<funcname>:<file> </dt> <dd> <p> Trace the evolution of the line range given by "<start>,<end>" - (or the funcname regex <regex>) within the <file>. You may + (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. @@ -930,11 +930,12 @@ of lines before or after the line given by <start>.</p></div> </li> </ul></div> -<div class="paragraph"><p>If “:<regex>” is given in place of <start> and <end>, it denotes the range -from the first funcname line that matches <regex>, up to the next -funcname line. “:<regex>” searches from the end of the previous <code>-L</code> range, -if any, otherwise from the start of file. -“^:<regex>” searches from the start of file.</p></div> +<div class="paragraph"><p>If “:<funcname>” is given in place of <start> and <end>, it is a +regular expression that denotes the range from the first funcname line +that matches <funcname>, up to the next funcname line. “:<funcname>” +searches from the end of the previous <code>-L</code> range, if any, otherwise +from the start of file. “^:<funcname>” searches from the start of +file.</p></div> </dd> <dt class="hdlist1"> <revision range> @@ -1097,7 +1098,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-06-06 12:15:38 PDT +Last updated 2015-05-06 12:32:59 PDT </div> </div> </body>
diff --git a/gitk.txt b/gitk.txt index 7ae50aa..6ade002 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -99,10 +99,10 @@ detailed explanation.) -L<start>,<end>:<file>:: --L:<regex>:<file>:: +-L:<funcname>:<file>:: Trace the evolution of the line range given by "<start>,<end>" - (or the funcname regex <regex>) within the <file>. You may + (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments.
diff --git a/line-range-format.txt b/line-range-format.txt index d7f2603..829676f 100644 --- a/line-range-format.txt +++ b/line-range-format.txt
@@ -22,8 +22,9 @@ of lines before or after the line given by <start>. + -If ``:<regex>'' is given in place of <start> and <end>, it denotes the range -from the first funcname line that matches <regex>, up to the next -funcname line. ``:<regex>'' searches from the end of the previous `-L` range, -if any, otherwise from the start of file. -``^:<regex>'' searches from the start of file. +If ``:<funcname>'' is given in place of <start> and <end>, it is a +regular expression that denotes the range from the first funcname line +that matches <funcname>, up to the next funcname line. ``:<funcname>'' +searches from the end of the previous `-L` range, if any, otherwise +from the start of file. ``^:<funcname>'' searches from the start of +file.
